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

Change-Id: Idfb0cc04edfbe2cb8ac96122ece8a0d1e00ab475