Merge "Fix to hide Display over other apps permission setting for the Scone application." into main