Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev