Merge "Allows the system window to be shown during the PB animation..." into main