Merge "Close Taskbar AFVs when locking screen." into tm-dev