[GSOCTC-1.1] Refactor Bricks Fixes

This contains the minor changes which are suggested in https://github.com/Catrobat/Catroid/pull/1004