Merge "Fix the back button ripple." into oc-dev am: a7914f24dd
am: 665d86a0fa

Change-Id: I27e94ab8e43fec9339cac03b49738069c1dbe206