Fixed upstream and we currently using small top bar which doesn't affected (cherry picked from commit 11ed47397d6922e0f34ebb6ac8057bb87b46d165)
Fixed upstream and we currently using small top bar which doesn't affected (cherry picked from commit 11ed47397d6922e0f34ebb6ac8057bb87b46d165)