Merge "Workaround to use System UI Context" into sc-dev