Fix for back forward buttons logic.

Change-Id: Ia7bde12a7af2f731d51457a7ba7932763aa6976a
Merge "Fix for back forward buttons logic."