Merge "Revert "Removes left/right buttons from bottom area."" into tm-qpr-dev