Merge "Removes old/unused left/right button logic from bottom area." into tm-qpr-dev