SwipeBackLayout: squash update from official

Change-Id: Ie68463aca9e3fcd329f10b256961b806acda5cfb