Merge "Update Special App Access Compose Components for ECM" into main