Merge "Remove duplicated onBackStackChanged() call." into oc-dev
am: c110c5edf4

Change-Id: Iab69422e0f47c2f7bf83664948dc6accee7da52f