Merge "app: aboot: Wait for display shutdown to finish"