Framework: code cleanup

Change-Id: Ibea908afb7f6175414f9a21373f4fa10f68c4d34
Frameworks: Transparency Mode Support (2/2)

Change-Id: I6d025224ee16cfb6d5e8751843673c19e3ba880d
Frameworks: Transparency Mode Support (2/2) fix

Change-Id: I8abe2e1edf78bd12480d77fbbdfa831778f32668