Bug 913385 - Organize codes to comply with coding style
Bug 913385 - Add Touch screen test