Added debug logging for image selection values.
Cleanup unused imports.
Simplifying room slot check and class cast check.
Activity refactoring WIP
Merge from trunk
Activity refactoring WIP
Activity refactoring WIP
New branch to try and get running activities re...