Merge "Show flyout if dismissed from shade. Add tests"