Merge "Update DisplayCutoutTestActivity for better UI"